projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a689ef c0d41e4)
bitkeeper revision 1.1159.212.103 (420609f1fbTBjl9ynLuVLkWWeqTOag)
authorkaf24@viper.(none) <kaf24@viper.(none)>
Sun, 6 Feb 2005 12:13:37 +0000 (12:13 +0000)
committerkaf24@viper.(none) <kaf24@viper.(none)>
Sun, 6 Feb 2005 12:13:37 +0000 (12:13 +0000)
Merge viper.(none):/home/kaf24/xen-2.0-testing.bk
into viper.(none):/home/kaf24/xen-unstable.bk

1  2 
xen/Makefile patch | diff1 | diff2 | blob | history
xen/arch/x86/Makefile patch | diff1 | diff2 | blob | history
xen/arch/x86/pci-pc.c patch | diff1 | diff2 | blob | history

diff --cc xen/Makefile
Simple merge
diff --cc xen/arch/x86/Makefile
Simple merge
diff --cc xen/arch/x86/pci-pc.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.